Skip to content

[release-1.1] ESO-566: Allow overriding operand container args outside the ExternalSecretsConfig API - #175

Open
bharath-b-rh wants to merge 1 commit into
openshift:release-1.1from
bharath-b-rh:release-1.1
Open

[release-1.1] ESO-566: Allow overriding operand container args outside the ExternalSecretsConfig API#175
bharath-b-rh wants to merge 1 commit into
openshift:release-1.1from
bharath-b-rh:release-1.1

Conversation

@bharath-b-rh

Copy link
Copy Markdown
Contributor

Summary

Manual cherrypick of #174: allow override of operand Deployment container args as comma-separated --key=value flags (OPERAND_EXTERNAL_SECRETS_ARGS, OPERAND_WEBHOOK_ARGS, OPERAND_CERT_CONTROLLER_ARGS, OPERAND_BITWARDEN_SDK_SERVER_ARGS) via operator Subscription CR.

Invalid overrides mark ExternalSecretsConfig Degraded; correcting or clearing the env recovers Ready / default args.

Differences from main

This is an adapted backport, not a straight cherry-pick:

Area main release-1.1
Invalid-arg error type UserConfigurationError IrrecoverableError (no user-config error type on 1.1)
OLM Subscription helpers Typed operator-framework/api + scheme registration Dynamic/unstructured clients only
Vendor / go.mod Adds github.com/operator-framework/api No new dependency / no vendor churn
E2E helpers Relies on newer shared helpers (ensureExternalSecretsConfigReady, typed ESC degraded checks, etc.) Creates ESC via existing ensureBitwardenOperandReady; degraded helpers live in helpers_test.go
Recovery wait Uses Ready wait that tolerates transient Degraded Polls until Degraded=False first (WaitForExternalSecretsConfigReady fail-fasts on Degraded)

Vendor / OLM API dependency

Intentionally not introducing github.com/operator-framework/api or a vendor update on this maintenance branch. Typed OLM clients are not required for the feature; dynamic Subscription/config.env updates are enough for the current e2e. Further OLM-focused e2e expansion on 1.1 is unlikely, so the dep cost is not justified here.

Test plan

  • Unit: go test ./pkg/controller/external_secrets/ -count=1 -run 'TestParseOperandArgsEnv|TestMergeContainerArgs|TestApplyOperandArgsFromEnv'
  • Deploy a 1.1 operator image that includes this change
  • E2E: make test-e2e E2E_GINKGO_LABEL_FILTER="Feature:OverrideOperandArgs"
  • Confirm invalid args → Degraded; correction → Ready; unset → default args restored

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 8, 2026
@openshift-ci-robot

openshift-ci-robot commented Aug 8, 2026

Copy link
Copy Markdown

@bharath-b-rh: This pull request references ESO-566 which is a valid jira issue.

Details

In response to this:

Summary

Manual cherrypick of #174: allow override of operand Deployment container args as comma-separated --key=value flags (OPERAND_EXTERNAL_SECRETS_ARGS, OPERAND_WEBHOOK_ARGS, OPERAND_CERT_CONTROLLER_ARGS, OPERAND_BITWARDEN_SDK_SERVER_ARGS) via operator Subscription CR.

Invalid overrides mark ExternalSecretsConfig Degraded; correcting or clearing the env recovers Ready / default args.

Differences from main

This is an adapted backport, not a straight cherry-pick:

Area main release-1.1
Invalid-arg error type UserConfigurationError IrrecoverableError (no user-config error type on 1.1)
OLM Subscription helpers Typed operator-framework/api + scheme registration Dynamic/unstructured clients only
Vendor / go.mod Adds github.com/operator-framework/api No new dependency / no vendor churn
E2E helpers Relies on newer shared helpers (ensureExternalSecretsConfigReady, typed ESC degraded checks, etc.) Creates ESC via existing ensureBitwardenOperandReady; degraded helpers live in helpers_test.go
Recovery wait Uses Ready wait that tolerates transient Degraded Polls until Degraded=False first (WaitForExternalSecretsConfigReady fail-fasts on Degraded)

Vendor / OLM API dependency

Intentionally not introducing github.com/operator-framework/api or a vendor update on this maintenance branch. Typed OLM clients are not required for the feature; dynamic Subscription/config.env updates are enough for the current e2e. Further OLM-focused e2e expansion on 1.1 is unlikely, so the dep cost is not justified here.

Test plan

  • Unit: go test ./pkg/controller/external_secrets/ -count=1 -run 'TestParseOperandArgsEnv|TestMergeContainerArgs|TestApplyOperandArgsFromEnv'
  • Deploy a 1.1 operator image that includes this change
  • E2E: make test-e2e E2E_GINKGO_LABEL_FILTER="Feature:OverrideOperandArgs"
  • Confirm invalid args → Degraded; correction → Ready; unset → default args restored

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai

coderabbitai Bot commented Aug 8, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: d98af404-ff02-41a2-a428-8fb95b179790

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Comment @coderabbitai help to get the list of available commands.

@openshift-ci
openshift-ci Bot requested review from TrilokGeer and swghosh August 8, 2026 07:03
@openshift-ci

openshift-ci Bot commented Aug 8, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bharath-b-rh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 8, 2026
…SecretsConfig API

Signed-off-by: Bharath B <bhb@redhat.com>
@openshift-ci

openshift-ci Bot commented Aug 8, 2026

Copy link
Copy Markdown

@bharath-b-rh: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants